Merge "Dismiss Play Protect dialog faster for PackageManagerServiceTests" into udc-dev