Merge "power: fix TryDifferentGovernors test" into rvc-dev am: d78626d962 am: f58a9662b5 am: 1d5f89c5d3

Change-Id: I1509e3e0cc5e2f76abfc57218f55c72165b4aced