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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/33193056', 'googleplex-android-review.googlesource.com/33200345', 'googleplex-android-review.googlesource.com/33184024', 'googleplex-android-review.googlesource.com/33664074', 'googleplex-android-review.googlesource.com/33916670', 'googleplex-android-review.googlesource.com/33751641', 'googleplex-android-review.googlesource.com/33922895', 'googleplex-android-review.googlesource.com/34044565'] into security-aosp-udc-release.

Change-Id: I740a09774a18898ea0697fa9589bfb4a1b310f72