Revert \\"Fix bug which displays \\"conf-factory..\\" string in dialer app.\\" am: cabac5e24e
am: fb66e5ff41

Change-Id: I7c051a8861bb3d522b8098a0defd3414ac0a2998