Merge "Restrict SimDialogActivity" into udc-dev am: 25d24e0c am: f0503e2a...

Merge "Restrict SimDialogActivity" into udc-dev am: 25d24e0c am: f0503e2a am: 565f4b57 am: f6f0c966

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



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