Merge "m framework-minus-apex should not build services" into main am: 13c1831ff6

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

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