Android Platform 12.1.0 Release 8 (8968309)
Merge cherrypicks of [17592536, 18764133] into sc-v2-platform-release.

Change-Id: Ida05240506e8789e2541a76cd0c20a588e2559cd