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

[automerger skipped] DO NOT MERGE Revert "Fix vulnerability in AttributionSource due to incorrect ..." am: 9858b3c3 am: 4d33e3d2 -s ours am: 1d9d76f1 -s ours am: 40727700 -s ours am: f23f688d -s ours am: 4bf3a85d -s ours am: 57473a0e -s ours

am skip reason: subject contains skip directive

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



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