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

Change-Id: I887c9ed77ce263897949011b8b5b5d73fc6294c8