Merge "Revert "Revert "Fix vulnerability in AttributionSource due to in..."" into tm-dev am: 7219217b68 am: 5404e76734

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

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