tree d5d5659b3ca9228d63e23520158cc710f907975e
parent 14d9b1de845d389fd8a00ab55d45ce29511fb483
parent 03f55b8e6219e124df1f7d27e17c504a93fae3b0
author Austin Borger <borgera@google.com> 1706587794 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1706587794 +0000

[automerger skipped] Merge "Revert "Revert "Fix vulnerability in AttributionSource due to in..."" into tm-dev am: 7219217b68 am: 5404e76734 am: 4cce35bbe2 -s ours am: 116fbd3c81 -s ours am: 03f55b8e62 -s ours

am skip reason: Merged-In Ic301a8518b8e57e1c9a2c9f2f845e51dca145257 with SHA-1 922e52bc3d is already in history

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

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