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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/29999960', 'googleplex-android-review.googlesource.com/29956669', 'googleplex-android-review.googlesource.com/30025712'] into security-aosp-udc-release.

Change-Id: I81f4dd71225b5d51387c46521e6315432ceb86d8