Android mainline 12.0.0 release 16
Snap for 7649214 from 1eb28587b292df199358214f845c96377c506310 to mainline-resolv-release

Change-Id: I6d13ed6182f0ea303d01e9f5925af8fdf0d2179d