Merge "Add SYNCHRONOUS to EnabledFlags for PackageManager"