Merge "power: add more modes into into power hal" am: 502d38d9f7 am: abd26b3862

Change-Id: I52d3916527338ab3a5eef3638bb5d6d9524fd2c1