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

[automerger skipped] Merge "Fix vulnerability in AttributionSource due to incorrect Binder call" into sc-dev am: c2a58a3b am: fd3d8c53 am: f84dc1ff -s ours am: f6c6b6af -s ours am: 890bcf61 -s ours am: b5927373 -s ours am: 0c3fbdf8 -s ours am: 2580005f -s ours am: d18bf4df -s ours

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

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



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