Merge "Deprecate APP_FOCUS_TYPE_VOICE_COMMAND"