[automerger skipped] Merge "Show customized message for private space while...

[automerger skipped] Merge "Show customized message for private space  while choosing lock" into main am: 27b7b2fa am: ab574330 -s ours

am skip reason: Merged-In Ic8173ff8c1af23fc593390acaff4c67390f99b9c with SHA-1 223737e0 is already in history

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



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