Merge "Re-submit "Fix not display the FDN menu if a SIM doesn't support FDN"" am: a4bc0296a5
am: c38a59da78

Change-Id: I0d96ec6f15dac7a631d044eab0d704e9bef6d5a6