Merge changes from topic "am-1b9e8ba39c5043f49190384b51db718c" into udc-qpr-dev am: 5909b534

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



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