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

Change-Id: Ic9349f7834a7535158f539c74f55c9a23d274708