[automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into tm-dev am: e0e72a57b7
am: 30d593d55f
-s ours am: 16ee9ab16d
-s ours am: 51e1fb9f8d
-s ours am: 54b99cf7a3
-s ours
am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490211 Change-Id: I93209ac94db64758ead79d6b4f09266dee4bc60c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: