Merge "[ActivityManager] Avoid orphan ContentProviderRecord."