[automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into tm-dev am: e0e72a57b7
am: 2b8075716b
-s ours am: 157d188e4f
-s ours am: 48986e3c4a
-s ours am: 97d842131c
-s ours
am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490211 Change-Id: I0ad03714dc6e931da63a0803fb9d29fecab30a0f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: