Merge changes from topic "am-9ec8f6e3864643ccaca902972a4ed1da" into...

Merge changes from topic "am-9ec8f6e3864643ccaca902972a4ed1da" into tm-qpr-dev-plus-aosp am: 5d9a654f

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



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