Merge changes from topic "am-0ff8881e2ca547c2bdb9e06a7ca70417" into rvc-qpr-dev-plus-aosp

* changes:
  Merge changes from topic "12933477" into rvc-dev am: 6a6a15d5 am: 5fe0e5ed am: 719a679d
  Ensure permissions are revoked on state changes am: 84c1247a am: 9259e1b2 am: 36689657