Merge "Fix the other app's scoped directory permissions are revoked"
am: c7f7267e99

Change-Id: I7e41d4555e3df069b98e0c4dde3ed8fd9dd7e543