[automerger skipped] Merge "Don't let profiles open the UserSettings overflow...

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

am skip reason: Merged-In I5e4c095cda3e19fa5c63c2c550a526f5da8ec5c1 with SHA-1 a2f5c083 is already in history

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



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