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

Change-Id: I0bef7f507d5d32de47960b1127967870b637a5d1