Merge "Fix not displaying "Allow restricted settings"" into udc-dev am: ac67b77af7

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

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