Android Platform 12.0.0 Release 12 (8968633)
Merge cherrypicks of [16511960] into sc-platform-release.

Change-Id: I14798fdabfe79810602b62b95fc2b067e5c6170b