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

Change-Id: Id823f2abf72906230902bbb8e61225747264758c