Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into...

Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into udc-dev am: 31af2ff6

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



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