[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 am: 15d80074 -s ours am: 3f1b9a7a -s ours am: ba12d5f1 -s ours am: 9daa7d39 -s ours

am skip reason: subject contains skip directive

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



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