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