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

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

Change-Id: Ifaa3c4e211b313d09005caed47c8b5b4da9fd078