am 1b872618: am 7a097ff1: Merge "Shared user retains permissions no longer used by any app on an app update" into mnc-dr-dev

* commit '1b8726182288900a0248c7a720a05f3d9c0e139e':
  Shared user retains permissions no longer used by any app on an app update