Android platform 12.1.0 release 9
Merge cherrypicks of [19670162] into sc-v2-platform-release.

Change-Id: Iffb7a9fbc0be62cd462af8adabf571bee18f63a4