[automerger skipped] Merge "Merge "Fix issue that user can't edit WFC mode for SIM2" am: d2727d5d9f am: c91d33798b" into qt-dev am: ba05893e37 -s ours
am:68937ee0ac-s ours am skip reason: change_id Icb3bd924f9e8e3e2e82845ab85ef25c2e38e13dc with SHA1ac4a495fc2is in history Change-Id: I8c5015c2543cf4700b82a571ae7b450f3a4591a9
This commit is contained in: