Merge "Fix leakage of pointer location" into tm-qpr-dev am: 7f96bd5a am: cf7e8cb0

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



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