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

Merge changes from topic "am-ce2920303dd54c6fb67ff2018292bdfb" into udc-qpr-dev-plus-aosp am: 25b5cd8f

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



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