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

Change-Id: I2c6b1504eb81c7676e16083bc4927cf95b1d741d