DO NOT MERGE ANYWHERE power: Adds POWER_HINT_DISABLE_TOUCH am: 2df182d7b1  -s ours
am: 3e8005b289  -s ours

Change-Id: Ie308c154a314faf32ca21f6913053753549a6f29