Merge changes from topic "am-6c98c749eebe490cad83fd4149151b68" into udc-d1-dev-plus-aosp am: 8e4692ce

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23468954



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