Merge "Update pkg mgr flags to match uninstalled component for GMS"