Android Security 12.0.0 Release 35 (8283927)
Merge cherrypicks of [16265241, 16265242] into security-aosp-sc-release.

Change-Id: Ifadec0e8fb608f6809fbda9a5109450fde95d2f2