[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: b67d221a -s ours am: 4ce025f5 -s ours

am skip reason: subject contains skip directive

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



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