Merge cherrypicks of ['googleplex-android-review.googlesource.com/30596090',...

Merge cherrypicks of ['googleplex-android-review.googlesource.com/30596090', 'googleplex-android-review.googlesource.com/30595922', 'googleplex-android-review.googlesource.com/31157081', 'googleplex-android-review.googlesource.com/31106214', 'googleplex-android-review.googlesource.com/31095391'] into security-aosp-udc-release.

Change-Id: I8f19c66d1dd4bccf452f7043c4239d4cbfc36bab