Merge "Revert "[Mainline]Remove PhoneFactory.addLocalLog and PhoneFactory.localLog""