[automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-qpr1-dev am: 8cfbd8aa9b
-s ours am: 24dc9f533a
-s ours am: 329fd334c3
-s ours am: 6f3dce1580
-s ours am: a0cd22a37e
-s ours am: 76d4f7848e
-s ours
am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490208 Change-Id: I4bd27654eb323e01287df39e50a6998e46ce1aed Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: