Merge "Restore system_app access to system-owned /data directories."