Merge "Deflake InattentiveSleep tests" into rvc-dev am: 0a9aff3ac3

Change-Id: Icbdc444900409acf73eec52f1118997cec2eaa31