Merge changes from topics "cherrypick-selfrevokebgonly-2hl0i8mi6m",...

Merge changes from topics "cherrypick-selfrevokebgonly-2hl0i8mi6m", "cherrypick-selfrevokemultiuser-emqfc1tlui", "cherrypick-selfrevokerenameself-lcm1yyzp8i" into tm-dev

* changes:
  Rename revokeOwnPermissionsOnKill to revokeSelfPermissionsOnKill
  Add clearCallingIdentity when persisting permission changes
  Fix background permission only not getting revoked