Merge changes from topic "am-62a2a7cc4e424d8eaf4ce82eee782d44" into udc-d1-dev-plus-aosp am: de1ee822

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



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