Merge "Add a trace constant for PackageManager"