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

Change-Id: If85549d67f68553ad91d116f24b6fd6f2cad6a32