[automerger skipped] Merge "Add new PowerAdvisor interface for SF to pass...
[automerger skipped] Merge "Add new PowerAdvisor interface for SF to pass hints to the power HAL." into pi-dev am: d98772df
am: e50205ba -s ours
Change-Id: I5f1a141873baadceab55de364a242ad615bac0e2