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