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

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