Merge "Fix ACTION_ONE_HANDED_SETTINGS breaks CTS IntentTest"