[automerger skipped] Merge "RESTRICT AUTOMERGE Stops hiding a11y services with...

[automerger skipped] Merge "RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity." into sc-dev am: 5d2e307f am: 0830cf7f -s ours am: 8d6f3c46 -s ours am: ab732627 -s ours am: f7ccd800 -s ours am: f9db36fe -s ours am: 51dd7de1 -s ours

am skip reason: contains skip directive

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



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