Merge "Revert "[Mainline]Remove PhoneFactory.addLocalLog and PhoneFactory.localLog"" into rvc-dev am: f4e9913c27 am: bbedc9ba35

Change-Id: I712c313bdbccbf149d57fc0deaf46c490d8be073