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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/30691628', 'googleplex-android-review.googlesource.com/31116450', 'googleplex-android-review.googlesource.com/31378480', 'googleplex-android-review.googlesource.com/31593106', 'googleplex-android-review.googlesource.com/31720928', 'googleplex-android-review.googlesource.com/31789823', 'googleplex-android-review.googlesource.com/32103083', 'googleplex-android-review.googlesource.com/32160027', 'googleplex-android-review.googlesource.com/31247040', 'googleplex-android-review.googlesource.com/31244299'] into security-aosp-udc-release.

Change-Id: I397a55edee28372f06babde5d92efe73a4033739