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

Change-Id: Ic6b5683701532a7511c5061ff4a3def05314a3cc