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

Change-Id: I4980fe9995496cb0d5a5501135bf83dc9a009d9e