Merge "power: throttle interaction hints" into oc-dev am: 78701217fd  -s ours
am: dd028e7c26

Change-Id: Ie7dae1e15d80fa422fed47efb21a5d388c5be3b2