[automerger skipped] Merge "RESTRICT AUTOMERGE Test services with no feedback type are included in enabled info list." into qt-dev am: 602ea7673d am: 2dba23165b -s ours am: b385394c24 -s ours am: 6611fd7665 -s ours

am skip reason: subject contains skip directive

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

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