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

Change-Id: I770c954951c6d03e14fa567db9761937d9c4892a