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

* commit 'fd41e5e5d97dc878836a01196810271d87256d16':
  Add a trace constant for PackageManager