Android mainline 12.0.0 release 16
Snap for 7550930 from dfeafb50717e08caed6201f078149f3b9f5b11c4 to mainline-resolv-release

Change-Id: Ia386ba69412abb271f826091bd926afcc8b54e61