[automerger skipped] Merge "Store trusted AttributionSources without token"...

[automerger skipped] Merge "Store trusted AttributionSources without token" into main am: bb262065 -s ours am: 70c87a14 -s ours am: a96a6314 -s ours

am skip reason: Merged-In Ie92b76ec83552cebb419318c214057f1ea8455d2 with SHA-1 c5127b47 is already in history

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



Change-Id: Ic70a67cf94df36a8eec627bf054a3f374baa8774
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>