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

Change-Id: Idfeb85d45a8ff0163714a8898976b8d57c40b6f1