Merge "Improve the UI of Press & hold power button settings" into tm-qpr-dev...

Merge "Improve the UI of Press & hold power button settings" into tm-qpr-dev am: 1cc741a7 am: 179c4dd4

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19291450



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