Android mainline 12.0.0 release 16
Snap for 7716385 from a6cd0bde4cecb190a9b954da479b401d2e8dc00e to mainline-resolv-release

Change-Id: Ib3ff273b54a296f91636d219bfab52e717d2ca62