Merge "Remove apex framework jars from hard-coded list" am: 71cf2a3cc6 am: 3969920129

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2054405

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