[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-ba54fc4fe6a24a9e9525545404b4ffd3" into tm-qpr-dev-plus-aosp am: 2435898a -s ours

am skip reason: Merged-In I6f617aad7e2776e320eaf157b3a71446143ef401 with SHA-1 b0f281bf is already in history

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



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