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