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: c44cfb9c am: 8f56db82

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



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