[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: accb88c8 am: 7ec573b8 am: 9bf35389 -s ours am: 9967d7c4 -s ours am: 2f453c26 -s ours

am skip reason: Merged-In Ic985afdb5e4495f2e051e6d0d62d39c6660c585e with SHA-1 7cb165f1 is already in history

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



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