[automerger skipped] Merge "add locallog for carrier config loader" am: b89eaefa51 am: c0e45e86c5
am: 5be123a5d0 -s ours
am skip reason: change_id If5b8997357997472f3617d1465d9f74187071107 with SHA1 db04c29911 is in history

Change-Id: I5d72b35d73679cee8ad7a0e5fc7c82560235fa41