Merge "Add 'Stay unlocked on fold' toogle to settings" into udc-qpr-dev am:...

Merge "Add 'Stay unlocked on fold' toogle to settings" into udc-qpr-dev am: 8c68b0e7 am: 32d914ea

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



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