[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: 1e6fb470 am: b1631f68 -s ours am: 60680c93 -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/+/21779363



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