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

Change-Id: I1a90cd9394341f663b1941ac7cc8a44fa55f63e5