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

Change-Id: I20f28dd9ece8f2424e4300dc5b990410f1cdd93f