[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: d97c0b00 am: 75cc5739 -s ours

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

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



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