Merge changes from topic "permission_chip" into rvc-qpr-dev am: 9a85dc9c0a

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

Change-Id: I9405dd5653d5ea99ba998ab30e211494aef5ce21