Merge changes from topics "pans", "pans-permission" am: 601d16a3 am: d11f866e am: 6c16aead

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I20fdb2f06b473f9f92e62138e72bd30d4384a267