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

[automerger skipped] Merge "Revert "Fix vulnerability in AttributionSource due to incorrect ..."" into tm-dev am: bc41a652 am: 0e408f94 am: 3ab864b5 am: 5ce988eb -s ours am: 145983ac -s ours am: bb5a3054 -s ours

am skip reason: Merged-In Ic301a8518b8e57e1c9a2c9f2f845e51dca145257 with SHA-1 922e52bc is already in history. Merged-In was found from reverted change.

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



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