[automerger skipped] Merge "Fix vulnerability in AttributionSource due to...

[automerger skipped] Merge "Fix vulnerability in AttributionSource due to incorrect Binder call" into tm-dev am: 4d354407 am: 512c1597 am: 9a2caf2d -s ours am: 9f326daf -s ours

am skip reason: Merged-In Ic301a8518b8e57e1c9a2c9f2f845e51dca145257 with SHA-1 922e52bc is already in history

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



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