[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-17d041adce9d48d4864c7ac2b61a93fc" into tm-qpr-dev-plus-aosp am: b7d12fb1 -s ours

am skip reason: Merged-In I1476a9381e797905d9b2456282cf0eb78d51a304 with SHA-1 aa771b56 is already in history

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



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