Merge "Increase power-press timeout" into tm-qpr-dev am: b9e3f713 am: d2433ad4

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20649591



Change-Id: I738fbb93d8685a40364284b9e4611ef28570830b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>