Android 12.1.0 release 20
Merge cherrypicks of [2203927] into sc-qpr3-release.

Change-Id: Ifd3e19469616fe618b59452f4de6629d042ef51f