[automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 1bcc404958 -s ours am: 8024751b9e -s ours am: 1dde2be0b7 -s ours

am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28807000

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