Android mainline 12.0.0 release 16
Snap for 7550930 from 7592b21d79a8c77243b7ec94983690584a387742 to mainline-resolv-release

Change-Id: Ia18cc1f73b5cabadf369c69f058adcc5fb00f13e