Merge "[Mainline]Remove PhoneFactory.addLocalLog and PhoneFactory.localLog" am: 28d8b57340
am: de9f000c8d

Change-Id: I070b81d07b14d9d4c38055c6703a19585a89a105