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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/30826678', 'googleplex-android-review.googlesource.com/30865893', 'googleplex-android-review.googlesource.com/30966740', 'googleplex-android-review.googlesource.com/30470925', 'googleplex-android-review.googlesource.com/30469236', 'googleplex-android-review.googlesource.com/30844329', 'googleplex-android-review.googlesource.com/28785149', 'googleplex-android-review.googlesource.com/31391399', 'googleplex-android-review.googlesource.com/31256090', 'googleplex-android-review.googlesource.com/31452893', 'googleplex-android-review.googlesource.com/31508632', 'googleplex-android-review.googlesource.com/31451013', 'googleplex-android-review.googlesource.com/31574620', 'googleplex-android-review.googlesource.com/31561933'] into security-aosp-udc-release.

Change-Id: If6c47cb773b18a601639e81c8eb18a9163c946b3