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

[automerger skipped] Merge "DO NOT MERGE Revert "Fix vulnerability in AttributionSource due to incorrect ..."" into sc-dev am: 17d50406 am: 8bafaa0e -s ours am: 595e0d12 -s ours am: 606e3efa -s ours am: 67461f7e -s ours am: 8ec061a0 -s ours

am skip reason: subject contains skip directive

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



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