am e2345774: am 772c6c0d: am 40f0efe0: Merge "Add a trace constant for PackageManager"

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