Android mainline 12.0.0 release 16
Snap for 7716385 from 18e4f5bfc451123548f3af70a3dba1fd19721a66 to mainline-resolv-release

Change-Id: Ib33aba6ad56c234dbb5c5718a5cb77fb26600a11