[automerger skipped] Merge "Remove skip_jarjar_repackage" into main am:...

[automerger skipped] Merge "Remove skip_jarjar_repackage" into main am: ba5c741f am: c1b51f7e -s ours

am skip reason: Merged-In I01136f7d00e13f258212885a52b11c1de34fd87a with SHA-1 65805dd3 is already in history

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



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