[automerger skipped] Merge "Revert "[Mainline]Remove PhoneFactory.addLocalLog and PhoneFactory.localLog"" am: 75ca681fda am: adfb52c762 -s ours am: d8e6872cde -s ours

am skip reason: Change-Id I80b6c8dafe1d5b20572d40c0e730796ebe24807d with SHA-1 0c1d0ddc79 is in history

Change-Id: I3efcc37b6a34afb96060ec81bc5d90bc724c6df0