Merge "power: fix TryDifferentGovernors test" into rvc-dev am: d78626d962 am: f58a9662b5 am: b3d1b42ff0 am: 4390f9a694 am: eba0115137

Change-Id: I57870530412abf6f5ee093cb7ce3af9e27d7f657