Merge "Don't enforce android.permission.TURN_SCREEN_ON in UDC." into udc-dev