Merge "Make RadioInfo settings menu work for mSIM"
am: a85fa6c51d

Change-Id: I0c83baafa8d30638b26c5dce3f23c722d3628991