Merge "Watcher/Watchable classes for PackageManagerService"