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

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

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