Android mainline 12.0.0 release 16
Snap for 7716385 from b15c939b6e9583ebb3c5a754c45e430d1ad73256 to mainline-resolv-release

Change-Id: I35a7bc083c080f85c058720bb55eca8eacb3ad5b