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

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

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



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