[automerger skipped] Merge "Revert "Introduce AttributionAndPermissionUtils."" into 24D1-dev am: 2257b4d3b6 -s ours

am skip reason: Merged-In I2e8a8cd456d1fb7f8d12072f6f0aaa12e6dc6e6c with SHA-1 f075f08d80 is already in history

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

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