[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: 5b8bb48fc6 -s ours am: d90f00aff4 -s ours am: e34bd50427 -s ours am: 86f9295c86 -s ours am: dcd38287ae -s ours

am skip reason: contains skip directive

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

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