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

Change-Id: I0415029fe73a27a43c01ed237a568fcb67611f42