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

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

Change-Id: Id05a4d7cf0e81a725c1d684f82d08381044c9f56