Android security 11.0.0 release 67
Merge cherrypicks of ['googleplex-android-review.googlesource.com/21120805'] into security-aosp-rvc-release.

Change-Id: I6447fca426a504d03c96050f86d385067af98956