Android mainline 12.0.0 release 16
Snap for 7550930 from 8687a85bc0e6ef46bac3bce290cca2cddc7d6720 to mainline-resolv-release

Change-Id: I03f20a00097b220402ab538749b788b5afb8b46c