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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/33010620', 'googleplex-android-review.googlesource.com/29639631', 'googleplex-android-review.googlesource.com/33963810', 'googleplex-android-review.googlesource.com/33983853', 'googleplex-android-review.googlesource.com/34557698', 'googleplex-android-review.googlesource.com/34407884', 'googleplex-android-review.googlesource.com/34401530', 'googleplex-android-review.googlesource.com/34599997', 'googleplex-android-review.googlesource.com/34432296', 'googleplex-android-review.googlesource.com/34635189', 'googleplex-android-review.googlesource.com/34390777', 'googleplex-android-review.googlesource.com/34442276', 'googleplex-android-review.googlesource.com/34940820', 'googleplex-android-review.googlesource.com/34824072', 'googleplex-android-review.googlesource.com/34992604', 'googleplex-android-review.googlesource.com/34959854', 'googleplex-android-review.googlesource.com/35158808', 'googleplex-android-review.googlesource.com/35442984', 'googleplex-android-review.googlesource.com/35459072', 'googleplex-android-review.googlesource.com/35085331', 'googleplex-android-review.googlesource.com/35367820', 'googleplex-android-review.googlesource.com/35504219', 'googleplex-android-review.googlesource.com/35602272', 'googleplex-android-review.googlesource.com/35742655', 'googleplex-android-review.googlesource.com/35501090', 'googleplex-android-review.googlesource.com/35742121', 'googleplex-android-review.googlesource.com/35479489', 'googleplex-android-review.googlesource.com/35775317', 'googleplex-android-review.googlesource.com/35805116', 'googleplex-android-review.googlesource.com/35236046', 'googleplex-android-review.googlesource.com/35902148', 'googleplex-android-review.googlesource.com/36074611', 'googleplex-android-review.googlesource.com/35609893', 'googleplex-android-review.googlesource.com/35930591', 'googleplex-android-review.googlesource.com/36021323', 'googleplex-android-review.googlesource.com/35478331', 'googleplex-android-review.googlesource.com/35602683', 'googleplex-android-review.googlesource.com/36102305'] into security-aosp-udc-release.

Change-Id: I05621efcb5281b43a0f198eea486d72c2f696d8f