[automerger skipped] [DO NOT MERGE] Adds basic smart-folder logging. am: ed538e53b0 -s ours am: 9e270a4daf am: 65166f688e am: 00d8ef98d5 am: 01a6aa099d -s ours

am skip reason: subject contains skip directive

Change-Id: If6ca26a011c751c27080328990847611a1f8c231