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

Change-Id: Iab61d0cf5e17e3cf31e0a0b6c5ce3693603f75a6