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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/28785276', 'googleplex-android-review.googlesource.com/31043660', 'googleplex-android-review.googlesource.com/31226834', 'googleplex-android-review.googlesource.com/31172438'] into security-aosp-udc-release.

Change-Id: Ifc7a1f919770dc31971d84f552f7588c7c9c60ea