Merge changes from topic "am-2bf535839ba94f92baa38f3124ed806a" into udc-qpr-dev-plus-aosp am: 9775962b

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



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