[automerger skipped] RESTRICT AUTOMERGE Test services with no feedback type are included in enabled info list. am: ee8f3bd47e -s ours am: 1cec01bfa3 -s ours

am skip reason: subject contains skip directive

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

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