Merge cherrypicks of ['googleplex-android-review.googlesource.com/23853414'] into udc-release. am: 47e9cb5219

Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/24302451

Change-Id: I13cb1e282aef1d68edf0d89ea109be6efbfb2143
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>