am 8728064c: (-s ours) am f3486868: am 2bb9861d: Merge "Add a trace constant for PackageManager"

* commit '8728064cab62c423a2869b3353b6fc72e9e0a19c':