Merge "Use Truth in PackageWatchdogTest.java"