[automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 31e69deb28
am: 39011f67c4
-s ours am: ce282b133f
-s ours
am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30490211 Change-Id: I005434498cc0ddc393502df74fa8e91596ec37aa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: