Merge "Allow priv_app read access to /data/app-staging directory"