Android 12.0.0 release 25
Merge cherrypicks of [15548052, 15548053, 15548731, 15548784, 15548801, 15548711, 15548732, 15548733] into sc-release

Change-Id: Ic72b92ffea5eac96a57fcba850588215505f411a