Merge "Include provider tag in complete attribution tag list" into sc-dev am: 9f8a57eb am: 7729f8cb

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

Change-Id: I347abda5028d1cfe70abbe5a0a52d4b029549685