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

Change-Id: Icd4894915c95229aaecfa605e757587b3ec0908d