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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/32078978', 'googleplex-android-review.googlesource.com/32959470', 'googleplex-android-review.googlesource.com/33152379', 'googleplex-android-review.googlesource.com/32748039', 'googleplex-android-review.googlesource.com/33315767', 'googleplex-android-review.googlesource.com/33444319', 'googleplex-android-review.googlesource.com/33623660', 'googleplex-android-review.googlesource.com/33611144', 'googleplex-android-review.googlesource.com/33921176', 'googleplex-android-review.googlesource.com/33555798', 'googleplex-android-review.googlesource.com/33985191', 'googleplex-android-review.googlesource.com/33667612', 'googleplex-android-review.googlesource.com/33688479', 'googleplex-android-review.googlesource.com/34125789', 'googleplex-android-review.googlesource.com/34111461', 'googleplex-android-review.googlesource.com/34038610', 'googleplex-android-review.googlesource.com/34259151', 'googleplex-android-review.googlesource.com/34300572', 'googleplex-android-review.googlesource.com/34306006', 'googleplex-android-review.googlesource.com/34306913', 'googleplex-android-review.googlesource.com/34125961', 'googleplex-android-review.googlesource.com/33915852', 'googleplex-android-review.googlesource.com/33918371', 'googleplex-android-review.googlesource.com/34291193', 'googleplex-android-review.googlesource.com/34379479', 'googleplex-android-review.googlesource.com/34261138'] into security-aosp-udc-release.

Change-Id: I3ccb22c9db4992ee0bde181df6cd79439dff440e