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

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



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