Merge "Robustify logging of analytics about PackageInstaller." into klp-dev