[automerger skipped] Merge "Show pointer_location for all users" am:...

[automerger skipped] Merge "Show pointer_location for all users" am: a057129f am: a0823aa3 am: 701d09d4 -s ours

am skip reason: Merged-In I0d87e34241e1450d5ea38ad6c564affa19209147 with SHA-1 0f298dbf is already in history

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



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