[automerger skipped] Merge "Revert "Add jarjar_prefix to...

[automerger skipped] Merge "Revert "Add jarjar_prefix to framework-minus-apex"" into main am: 9f5f7378 -s ours am: 11070527 -s ours

am skip reason: Merged-In Ie2ee7578352463aa42942c0b42b78557c414fb52 with SHA-1 f9bdb797 is already in history. Merged-In was found from reverted change.

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



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