Merge changes from topic "am-2cf9a50460c3458a994824c583cd0e06" into udc-qpr-dev-plus-aosp am: 1450a929

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



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