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

Merge "[automerger skipped] Merge "m framework-minus-apex should not build services" into main am: 13c1831f am: bed2522a -s ours" into udc-qpr-dev-plus-aosp am: bd48542c -s ours

am skip reason: Merged-In I1eb64da7318d1bad003e71962ca8a90b7229ea49 with SHA-1 338107bd is already in history

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



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