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

Merge changes from topic "am-be8a688e508149aebfd672facfbd91e3" into udc-qpr-dev-plus-aosp am: aff29336

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



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