am c0b3f2bd: am e6c4fb00: Merge "Only revoke ownerless grants when unprivileged." into lmp-dev

* commit 'c0b3f2bd28c8efd5bc594e35eb92a9ff18d3b3e5':
  Only revoke ownerless grants when unprivileged.