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

Change-Id: If936f80dedcb37aecd9414b066259436357fbe0f