Android Platform 12.0.0 Release 8 (SPM1.220111.006)
Merge cherrypicks of [17397180, 17628096] into sc-platform-release.

Change-Id: I88fb0c9724bca573122d48a7513a20672c75695d