Merge "Disable ActivityKeyboardShortcutsTest on watches." into oc-dev