Merge cherrypicks of ['googleplex-android-review.googlesource.com/29861874'] into security-aosp-udc-release.

Change-Id: Icbe27f40de59c90a5c5ba60371980a0ec043f31c