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

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



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