Merge "RESTRICT AUTOMERGE Stops hiding a11y services with the same...

Merge "RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity." into sc-dev am: 5d2e307f

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



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