[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-e1391362c40241b5824d490b89ad654c" into tm-qpr-dev am: 4f6472c6 -s ours am: 435e24fd -s ours am: 71ce985b -s ours

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

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



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