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

Merge changes from topic "am-eddb24f0a32a4116af2506a8a3f89680" into udc-qpr-dev-plus-aosp am: 92a1a245 -s ours

am skip reason: Merged-In I720699093d5c5a584283e5b76851938f449ffa21 with SHA-1 b38e1e5a is already in history

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



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