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

Change-Id: I8c5c396beb0e15e80e9a3774ddcda9817d4bcc7d