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

* commit '1f6204a8856dd85dd3f83f692a4edf2c81c37cbd':
  Add a trace constant for PackageManager