Merge "Fix PackageStateTest fails on Intent.getExtraIntentKeys" into main