Merge "Icon displays abnormally about FDN in the phone process" am: 06af813ecd am: af613cc5e6 am: b1dcd8a019 am: c2bd159bbc
am: ed1bdb509f

Change-Id: Icde91b79bd57f9f39b56220962830e0d63beaf23