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

Change-Id: Id4ee29027be7715d7b1748c9eb93183a6b01d037