Merge "Remove framework-minus-apex_jarjar-sharded" into main am: 15677db7

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



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