DESCRIBE THE ISSUE IN DETAIL: The emulator CLI's -dns-server option does not seem to work on API 31 or newer.

STEPS TO REPRODUCE:

Run a local dns server and log queries: dnsmasq -dq
Start an API 31 emulator: emulator -avd emulator31 -dns-server 127.0.0.1
Resolve a domain: adb shell ping www.reddit.com
dnsmasq does not show that domain in the log.

However, on API 30, these same steps will result in the dnsmasq showing the queries to reddit.com:

dnsmasq: query[A] www.reddit.com from 127.0.0.1
dnsmasq: forwarded www.reddit.com to <ip>
dnsmasq: reply www.reddit.com is <CNAME>
dnsmasq: reply reddit.map.fastly.net is <ip>

We need to override some DNS entries in order to test our app in environments that do not have external internet access, but it stopped working in API 31 or newer.