[automerger skipped] Merge "RESTRICT AUTOMERGE Test services with no feedback type are included in enabled info list." into rvc-dev am: c2a8aee1c5 am: 0672373b7e -s ours am: 824154aa5a -s ours am: cc4a9cf726 -s ours

am skip reason: subject contains skip directive

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

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