Android 12.1.0 release 19
Merge cherrypicks of [18330638] into sc-qpr3-release.

Change-Id: I4ff88966ea0b8b4fe753834bc968570c4f3badbb