Merge changes from topic "am-a5a0cafc4d984c3d849d6597e5b3680a" into udc-d1-dev-plus-aosp am: 1b156e6a am: d6522317

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



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