Merge "Revert "Fix vulnerability in AttributionSource due to incorrect ...""...

Merge "Revert "Fix vulnerability in AttributionSource due to incorrect ..."" into tm-dev am: bc41a652 am: 0e408f94 am: 3ab864b5

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



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