Merge "Deflake InattentiveSleep tests" into rvc-dev am: 0a9aff3a am: 543b1385 am: 0b3c0c3f am: 7a4c251d am: 935d65e0 Change-Id: Ibfb9dd53cd9a47d2ef29bd497963d197a2202472