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

Change-Id: Ibcfabb178cc66fccdd6fcef5863a1b056cc85a40