Android Platform 12.0.0 Release 7 (8326418)
Merge cherrypicks of [16386056] into sc-platform-release.

Change-Id: I45ba22cc3c9961d010097562affc3a0069efee4d