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

Merge changes from topic "am-c2ff19434dbe49de9cf5ade8ad97b5c9" into tm-qpr-dev-plus-aosp am: 22beacf6 -s ours

am skip reason: Merged-In I76208722bbb7a407ba1f2dc4305a28226166414d with SHA-1 c97296e9 is already in history

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



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