[automerger skipped] Merge "RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity." into sc-dev am: 5d2e307f6e am: 0830cf7fbe -s ours am: 8d6f3c4660 -s ours am: ab7326276b -s ours am: f7ccd80017 -s ours

am skip reason: contains skip directive

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

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