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

[automerger skipped] Merge "DO NOT MERGE Revert "Revert "Fix vulnerability in AttributionSource due to in..."" into tm-qpr-dev am: e326cb83 -s ours am: c9656cf8 -s ours am: 2d39f490 -s ours am: 6c6b1ddc -s ours am: 4de184f8 -s ours

am skip reason: subject contains skip directive

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



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