Merge "Skip jarjar repackage on SystemUI-tests-base and SystemUI-tests" into...

Merge "Skip jarjar repackage on SystemUI-tests-base and SystemUI-tests" into main am: ff8a5a36 am: 1c54bce7

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



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