Merge "Add a developer option to controll mockmodemservice permission" am: 78b2b241a9

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

Change-Id: Ia08609cddc63034e3f9d02f64727d92fe9e2348f