Merge "Remove package name from the attribution tag." into rvc-dev am: c30e3937 am: e7a2e515

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11689596

Change-Id: I051db54881f9366c87a506e35577be72c6f2befb