[automerger skipped] Merge "[Mainline]Remove PhoneFactory.addLocalLog and PhoneFactory.localLog" am: 28d8b57340 am: de9f000c8d
am: 56712e8a76 -s ours
am skip reason: change_id I5df842b0dc9e85297266e0651f441f739f36dc2c with SHA1 bf3c3c4379 is in history

Change-Id: I1050c5c9ad54c6338346e2fd079095f452741b47