[automerger skipped] [DO NOT MERGE] Adds basic smart-folder logging. am: ed538e53b0 -s ours am: 9e270a4daf am: c81d9e4980 am: e8ca822cfd am: c559777b16 -s ours

am skip reason: subject contains skip directive

Change-Id: I187b6c84ff04fef6976020c6fecaa7fd23f536b3