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