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

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



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