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

Change-Id: I085919cefb9576d539e44034dcd216e4a2b49451