Android 12.1.0 release 21
Merge cherrypicks of [18356502] into sc-qpr3-release.

Change-Id: I6608d67b0155fbe0395f2fd2b0b30529ce9a6224