Merge "Revert "Fix not display the FDN menu if a SIM doesn't support FDN"" am: b6bc369ac1
am: 29ebccd613

Change-Id: Ieb0361e3984493fa50ee9d8e221a189c18d7670b