Merge changes from topics "pans", "pans-permission" am: 601d16a336

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I72035b6d5d6504cece1df472ae317e865ceb7882