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