Merge "Fix require on screen toggle on guest user." into udc-qpr-dev am: 800728a5 am: 7461036d

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



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