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

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

Change-Id: I9e01ccfdd0a8a84c5408a076a30cf70bce204268