[automerger skipped] DO NOT MERGE Revert "Revert "Fix vulnerability in AttributionSource due to in..." am: 53657da852 -s ours am: 46eaba139a -s ours am: d2e38f77b7 -s ours am: d20e1f1c93 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23590386 Change-Id: Ie56beae7f8dc8a70fbf327bc4c74f5d437c8b655 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: