[automerger skipped] Merge "RESTRICT AUTOMERGE Test services with no feedback type are included in enabled info list." into sc-dev am: d77e57ca6f am: 2f39919d46 -s ours am: 87b34f288d -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/19815792

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