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

Change-Id: I7766f042544f111fbcfccfbdf88c938a12be759a