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

Change-Id: Id3a3ba048f0d88f18646cf5bb20faca243465005