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

Change-Id: I0ba60c3767b165d40265b59be9a9cfe224fe5566