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

* commit '40f0efe03df87cf340de089bcb09010a88f8a120':
  Add a trace constant for PackageManager