[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: 76c8e3526a
-s ours am: ac9402af41
-s ours am: df6770ca14
-s ours
am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490209 Change-Id: I8da7ff34745086719e23b374db74b4ba7fff69de Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: