Merge "Ensure AlarmManager knows of IDLE state." into udc-dev