Merge "Merge "Add delay to power-button power-off after gesture wakeup." into...
Merge "Merge "Add delay to power-button power-off after gesture wakeup." into qt-dev am: 65cf57bf" into qt-dev-plus-aosp
am: d2877e32
Change-Id: I498597d62688429c5dc7c1471c3dcdabd5a2fc19