DO NOT MERGE Revert "Revert "Fix vulnerability in AttributionSource due to in..." am: 53657da8

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



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