Merge "Cleanup USER_OWNER in a11y manager and tests"