Merge "Optimize AttributionSource tokens - base" into sc-dev am: 2b90cc82 am: 01f6847c am: 6ea94803

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

Change-Id: Idf7a9f45b22a9cfff8fd6550c77588e4fd5cf25f