Android Security 11.0.0 Release 66 (9682389)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/21224930', 'googleplex-android-review.googlesource.com/20660096'] into security-aosp-rvc-release.

Change-Id: I8d92e217f8024175d3cb1b7b90a0910821f5f9d6