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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/32398219', 'googleplex-android-review.googlesource.com/32335327', 'googleplex-android-review.googlesource.com/31299877', 'googleplex-android-review.googlesource.com/32628923', 'googleplex-android-review.googlesource.com/32772526', 'googleplex-android-review.googlesource.com/32222517', 'googleplex-android-review.googlesource.com/32475211', 'googleplex-android-review.googlesource.com/32648969'] into security-aosp-udc-release.

Change-Id: Ic219e5093cdc939725fea7036ded9bbfbbb4beb8