Android Security 12.0.0 Release 36 (8528210)
Merge cherrypicks of [16206381] into security-aosp-sc-release.

Change-Id: I0bfbb1fe988e8797f0b51ca91121791697dac3f0