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

[automerger skipped] Merge "Store trusted AttributionSources without token" into udc-dev am: f0ebf508 am: 09e85086 am: 271087c5 -s ours am: 6c633830 -s ours

am skip reason: Merged-In I5731ceeab5b9d0c72ce0131e2c9ba2f74558218c with SHA-1 670a363d is already in history

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



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