Merge "Update isAppStorageSandboxed to handle shell uid."