Merge cherrypicks of ['googleplex-android-review.googlesource.com/28504378',...

Merge cherrypicks of ['googleplex-android-review.googlesource.com/28504378', 'googleplex-android-review.googlesource.com/28904341', 'googleplex-android-review.googlesource.com/29360799'] into security-aosp-udc-release.

Change-Id: I05f33bd267e383619d7b8b337293357470041a1a