[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: e3be2b5b -s ours

am skip reason: subject contains skip directive

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



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