[automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: c4963a73f0 am: 41efccc461 -s ours am: 0044ecdb7d -s ours

am skip reason: contains skip directive

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

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