Merge "Restrict SimDialogActivity" into udc-dev am: 25d24e0c am: a7b09338 am: f716dc59

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



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