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

* commit '772c6c0d2d62af7295030ded14b3f428ab325ef4':
  Add a trace constant for PackageManager