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

Change-Id: I8848e37e67b9442e929eec61ecd4795ed34f02bf