Android Security 11.0.0 Release 60 (9033583)
Merge cherrypicks of [12265987, 12265921] into rvc-release

Change-Id: I24cd6fc327d0faf183caf290b463c1af1ee09cdf