Android mainline 12.0.0 release 94
Snap for 7550930 from 3cfc57ddb0289549f39cdb7ff916a425c3322e24 to mainline-resolv-release

Change-Id: I4bb7a5f8308066cdd5fd4c1946c0ef4e77e4c3aa