Merge "Deterministic PowerManagerServiceTest" into rvc-dev am: ac423f3a am: 0d82ff5a am: 5d2873e0 Change-Id: I081b9193d65b3a21588d0dbb3bf911adf13a0365