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

Change-Id: Ib0ca4101dadfbd90a001e5932858f8dc4412c52a