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

Change-Id: Iba0ba3212acee7a667d9eb1ed64783c144f0e230