Merge "Revert "[Mainline]Remove PhoneFactory.addLocalLog and PhoneFactory.localLog"" am: 75ca681fda

Change-Id: I49b70da9cdb4769fe120b0464c7a77ceb45c7270