Merge changes from topic "am-57c1c2a4b22b4938a4ade845fdbbb971" into...

Merge changes from topic "am-57c1c2a4b22b4938a4ade845fdbbb971" into udc-qpr-dev-plus-aosp am: 095aa382

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



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