Merge "[ActivityManager] Avoid unnecessary restart provider process"