[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: 5404e767 am: 4cce35bb -s ours am: 116fbd3c -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: I36ad4f83848e152ab9f6981555d9c745e3dc1932
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>