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

Change-Id: I7cb423e86a7444b96f2f61b1cb344600e272faac