Merge "Fixes SelectLongPressTimeoutPreferenceControllerTest summary check." into udc-dev