Merge "Settings: Fix fallback summary for power_button_instantly_locks preference" am: b1cea4f1bc

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

Change-Id: Ia62597a163e529ef20e4136645709b0d300a4fc4