Merge changes from topic "am-cec4b7b908aa4897a86dab991d85216b" into...

Merge changes from topic "am-cec4b7b908aa4897a86dab991d85216b" into udc-qpr-dev-plus-aosp am: 6c202470

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



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