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

Change-Id: I3fe67d6def65deae825297dda389750f29fcadcf