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

Change-Id: I049d1b6fa72ff758c101f6b3f4f914b9087cabf4