Merge \"power: Adds POWER_HINT_DISABLE_TOUCH\" into nyc-mr1-dev
am: 3653956398

Change-Id: I98fe9bc61b201401f4e38f76fdb4dc51eff1960a