Merge "power: fix TryDifferentGovernors test" into rvc-dev am: d78626d962 am: d6621a5763

Change-Id: I49b001bf9c854884f8facc63ff67fedea853dc0e