[automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-v2-dev am: b937941549
-s ours am: cfaac63123
-s ours am: 6f5e87739b
-s ours am: e37a2247f1
-s ours
am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490209 Change-Id: Ideca8b59f0989b915d45db43840e52d30a1c8c22 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: