[automerger skipped] Merge Android 12 am: 027d657a40 -s ours am skip reason: Merged-In I20324e8e87e3b6a942317b79f74d6919f7ead230 with SHA-1 193c760b4b is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/SampleLocationAttribution/+/1847384 Change-Id: I97c1091e3f13e5c0ab08b0dcfa6e68cecf9516b4