Merge "Keep PackageMonitor for weak reference in LocaleManagerService" into main