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

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

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