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

[automerger skipped] Merge "Revert^2 "Revert "Fix vulnerability in AttributionSource due to in..."" into tm-dev am: d42b60e9 am: 4b7985ba am: 31fa9837 -s ours am: ac48333a -s ours am: 0ede07ef -s ours am: 2aeaf468 -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/+/26057828



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