Merge "[ActivityManager] Ensure provider external access count will be released."

            } finally {

                // Ensure that whatever happens, we clean up the identity state

                sCallerIdentity.remove();

            }

            // We've got the fd now, so we're done with the provider.

                // Ensure we're done with the provider.

                removeContentProviderExternalUnchecked(name, null, userId);

            }

        } else {

            Slog.d(TAG, "Failed to get provider for authority '" + name + "'");

        }