[automerger skipped] DO NOT MERGE Revert "Revert "Fix vulnerability in...

[automerger skipped] DO NOT MERGE Revert "Revert "Fix vulnerability in AttributionSource due to in..." am: 53657da8 -s ours am: 46eaba13 -s ours am: d7366d64 -s ours am: eb1db5b2 -s ours

am skip reason: subject contains skip directive

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



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