Android mainline 12.0.0 release 94
Snap for 7550930 from 2a565e72282566bf820af9f9a26ce19173f4d3e4 to mainline-resolv-release

Change-Id: I107c7ed22a4bca57a80fa708fbee4ed84f01ab61