[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 tm-dev am: e0e72a57 am: 30d593d5 -s ours am: 16ee9ab1 -s ours am: 51e1fb9f -s ours

am skip reason: contains skip directive

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



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