[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-dev am: ead69f3d -s ours am: ad1e470f -s ours am: 2112cc5e -s ours am: 3764a4cb -s ours am: 559b96d9 -s ours am: 8ab0f1de -s ours

am skip reason: contains skip directive

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



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