[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 am: 476d2494 -s ours am: 0d8dde3c -s ours am: 8487ca89 -s ours am: 21035623 -s ours

am skip reason: subject contains skip directive

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



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