[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: 2d57b563 -s ours am: c6e7d1e8 -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: I488d97a98ae74c2e4dfa0e9e0a87085639580f60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>