[automerger skipped] Merge "Fix vulnerability in AttributionSource due to incorrect Binder call" into sc-dev am: c2a58a3bb7 am: fd3d8c5342 am: f84dc1ff0a -s ours am: f6c6b6af96 -s ours am: 890bcf61af -s ours am: b592737398 -s ours am: 0c3fbdf807 -s ours

am skip reason: Merged-In I3f228064fbd62e1c907f1ebe870cb61102f788f0 with SHA-1 5d79e535b9 is already in history

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

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