Merge "m framework-minus-apex should not build services" into main am: ef5a9ea7 am: d97c0b00

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



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