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: Ib749a01d9076ea1baa8731a40945d338e3ea79a0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>