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

Change-Id: I9a2a4d90b451904ffe7a98826a301079598b9e9b