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

Merge changes from topic "am-c5959a53b1ca45b4ba0de6bdeeed2650" into udc-qpr-dev-plus-aosp am: d12f3828

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



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