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

* commit '2bb9861d481b9a7e5e3001ebb9592f382d53b5e4':
  Add a trace constant for PackageManager