[automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 6e413c4cff
am: 22fe77ca00
-s ours
am skip reason: Merged-In I5e4c095cda3e19fa5c63c2c550a526f5da8ec5c1 with SHA-1 a2f5c08370
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30489978
Change-Id: I7db5d19a559e3240b0bfbbffe896064b3dd56f7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: