am 946fa817: am f3486868: am 2bb9861d: Merge "Add a trace constant for PackageManager"

* commit '946fa8171d9c2089fa0b37c14e61fa767a5c8fdc':
  Add a trace constant for PackageManager