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

[automerger skipped] Merge "Revert "Revert "Fix vulnerability in AttributionSource due to in..."" into tm-dev am: 7219217b am: 818e5f38 -s ours am: 1799ccd2 -s ours am: d5470a5c -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/+/21896481



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