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

Change-Id: I5135ddb75679ff6e4ffe5bb8daff97daf05deb34