Merge cherrypicks of ['googleplex-android-review.googlesource.com/28852756', 'googleplex-android-review.googlesource.com/29054680', 'googleplex-android-review.googlesource.com/29056664'] into security-aosp-udc-release.

Change-Id: Ia20c945d97bb9439278606130acdb8a552436cfa