[automerger skipped] Merge "Don't let profiles open the UserSettings overflow...

[automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into tm-qpr-dev am: f07deaf5 -s ours am: e716dcdb -s ours am: 168447a4 -s ours am: fc6c9000 -s ours

am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30489977



Change-Id: I8062819347417a0443b76cb487c7077a0ea6c889
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>