Merge changes from topic "am-099d562cd2b94d71a8aabd4e575f298e" into udc-d1-dev-plus-aosp am: a035b6e0

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



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