Merge "Fix issue that user can't edit WFC mode for SIM2"
am: d2727d5d9f

Change-Id: I1bbbe7efe7f057dfcf55f9685f2b10ebd94e3f38