Android Platform 12.0.0 Release 7 (8326418)
Merge cherrypicks of [16243879, 16199369, 16199730, 16554823] into sc-platform-release.

Change-Id: Ie04e6052af89e9fb9020450c4a5a853d8063e9a0