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

Change-Id: I4ea046955fb8b668d25f5191db9082c574a9831e