[automerger skipped] Merge changes from topic "permission_chip" into...

[automerger skipped] Merge changes from topic "permission_chip" into rvc-qpr-dev am: 9a85dc9c am: 974eefa7 -s ours

am skip reason: Change-Id I871094c32ce5ec940d779626333caa0ca500a4e3 with SHA-1 fe4b8c26 is in history

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

Change-Id: Ibd16022e6d34e4fc9d137741fc1a3b14de50bf9f