Merge "Stops hiding a11y services with the same package+label as an activity in shortcut logic." into main