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

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