Android mainline 12.0.0 release 16
Snap for 7550930 from 225ec71c04c3d4d3c157a9da6e37a5f799b7c376 to mainline-resolv-release

Change-Id: Ibe40cde43d8332f5ce1e8b5ccc388510f67485d3