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

Change-Id: Ia66379ae2421e5458e6bd59e132f445b18db028b