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