Merge "APK still has privileged flag after being moved from "/system/priv-app""