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

Merge "Merge "Remove package name from the attribution tag." into rvc-dev am: c30e3937 am: 24ec797d" into rvc-d1-dev-plus-aosp am: cf6cff7d am: d7529115

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

Change-Id: Ief3587034261d1187a690574e9561dbca3a7df2e