[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 sc-qpr1-dev am: 8cfbd8aa -s ours am: 24dc9f53 -s ours am: 329fd334 -s ours am: cf4b80e4 -s ours am: 2060250a -s ours am: f371a987 -s ours

am skip reason: contains skip directive

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



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