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

Change-Id: If4e54a8c123da2a5b839983ee0c2ae0afed852f2