am 6782ca0b: Merge "Add a trace constant for PackageManager"

* commit '6782ca0b766c777ae285d2b7bcfcd8232ffe34d9':
  Add a trace constant for PackageManager