[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: 23621ee8 -s ours

am skip reason: contains skip directive

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



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