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

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

Change-Id: Id6e4192512e8a8c4f8aa3e011436bd2f8399acd0