[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: 2b807571 -s ours am: 157d188e -s ours am: 48986e3c -s ours am: 97d84213 -s ours

am skip reason: contains skip directive

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



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