Merge "[automerger skipped] Don't print :__pkg__ for package rules, since...

Merge "[automerger skipped] Don't print :__pkg__ for package rules, since that's the default. am: 68e9d96d am: 760adcb8 am: b1bd55eb -s ours" into rvc-qpr-dev-plus-aosp am: cc80df00 -s ours

am skip reason: Change-Id I0d2d86f00c3d38e603d6f58c4b1dd9a4170bf819 with SHA-1 68e9d96d is in history

Change-Id: I0191a5483c6411844a7c2cf89b51230974b77b68