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

Change-Id: I43a774c1495ad0b8a6ca7a5bf78f36f2077b48f2