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

Change-Id: I077d92c279df853f06d397ade0a23670a1bddfc0