Merge "Include provider tag in complete attribution tag list" into sc-dev am:...

Merge "Include provider tag in complete attribution tag list" into sc-dev am: 9f8a57eb am: c0fe8c59 am: 0c5ee040

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

Change-Id: Ia9880d8135b38050a2f65509b32922c7368d4f0f