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

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



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