Merge "Merge "Add more logging around extra attribution tags" into sc-dev am:...

Merge "Merge "Add more logging around extra attribution tags" into sc-dev am: f1f0b2e3 am: 132752f6" into sc-v2-dev-plus-aosp am: e6cbc130

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

Change-Id: I5b84b642f9e3439e11fac0c4c4f98ae40e5d8a28