Merge cherrypicks of ['googleplex-android-review.googlesource.com/34018910'] into security-aosp-udc-release. Change-Id: Ieee2925f4d9c4678f4e6002eaf7f1132d5d7ef3f