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

Change-Id: Id8df96e31563d5aa5f43f78f9f4ad9378243da9c