Merge changes from topic "am-900835d502114d3685db714f5dd1f7ed" into...

Merge changes from topic "am-900835d502114d3685db714f5dd1f7ed" into tm-qpr-dev-plus-aosp am: e6c7186c

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



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