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

Change-Id: Ic67b527e8758c7c7f845eeda71ad163f156ca357