[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: 63433a69 -s ours am: e950ace6 -s ours am: cb9422b0 -s ours

am skip reason: subject contains skip directive

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



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