Merge "Remove a hack to fix a short power button press behavior." into tm-qpr-dev am: 6cb72a5100 am: f369433f13

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

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