Merge changes from topic "am-e1391362c40241b5824d490b89ad654c" into tm-qpr-dev...

Merge changes from topic "am-e1391362c40241b5824d490b89ad654c" into tm-qpr-dev am: 4f6472c6 -s ours

am skip reason: Merged-In Ia7d8d00d9de0fb6694ded6a80c40bd55d7fdf7a7 with SHA-1 a66a3156 is already in history

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



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