Merge "Add a developer option to controll mockmodemservice permission"