Merge cherrypicks of ['googleplex-android-review.googlesource.com/32131540', 'googleplex-android-review.googlesource.com/32662544', 'googleplex-android-review.googlesource.com/32649550'] into security-aosp-udc-release.

Change-Id: I86185c39e1010a0ded6afccae2df99931edc4af0