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

Change-Id: Ic37b9b0b4fff6f773c631e960fa3a1154176a66d