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

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

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