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

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



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