Merge "Show customized message for private space while choosing lock" into main am: 27b7b2fa

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



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