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: I31265d1e0d9bc48743a01475207b88db3f3c1181