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

Change-Id: Icc5141a13ac71a168891a9d0b46d7fe8e5d71792