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

Change-Id: I186f229bd427968ef1b4cada5c0856a7c0346c26