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

Change-Id: I4862d60308b704f4bbb56c0c42b41297ee292322