Android mainline 12.0.0 release 16
Snap for 7631994 from cfb9cb3abdfefc0a8e21427c030ceff582f87e94 to mainline-resolv-release

Change-Id: Ia3e25b194fe57c9a5aed909cdcb63f7d84a39faa