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

Change-Id: I1ffb5e1d61dacf95c77a3438730e9b9f519774ff