[automerger skipped] Merge "m framework-minus-apex should not build services"...

[automerger skipped] Merge "m framework-minus-apex should not build services" into main am: ef5a9ea7 am: 34a6ecd4 -s ours am: c63ac4c0 -s ours

am skip reason: Merged-In I9ab58d551a7446e328412af27a94d760d6f0cb67 with SHA-1 cc8b4dd4 is already in history

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



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