Android 12.1.0 release 25
Merge cherrypicks of [16689475, 16810167, 16844521] into sc-d2-release.

Change-Id: Ia02b42fd092027c62f14bbc0ab4bc6a00d933a4e