[automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 44a35ac07b -s ours am: 9d81e7d2e5 -s ours am: d5e5daf68e -s ours am: 80f4a4d681 -s ours am: aa291510b8 -s ours am: 37173a8dfb -s ours am: 6329c66f26 -s ours am: 2a8fa73437 -s ours
am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30487387 Change-Id: I75c4e3c61c63b37df66b90b37cbd7a8efdb9e870 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: