Android mainline 12.0.0 release 16
Snap for 7649214 from 253075af8e31682e95c00753c662e763f2aff635 to mainline-resolv-release

Change-Id: Ie18c51f48612de51ba465cdc033e675931b75717