Android security 11.0.0 release 73
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24296965', 'googleplex-android-review.googlesource.com/24296958'] into security-aosp-rvc-release.

Change-Id: I6532968ee72ab8b61487e397dfdddbdbf442521a