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

Change-Id: I8cb7af5dd2cbc6bda5a7a9419b4362b2c1843803