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