Merge "[automerger skipped] [DO NOT MERGE] Adds basic smart-folder logging. am: ed538e53b0 -s ours am: 9e270a4daf am: c81d9e4980" into rvc-d1-dev-plus-aosp am: 02c3d0ee40 am: 1272929533 -s ours

am skip reason: subject contains skip directive

Change-Id: I2a227bc60bdb13bc5c029b050514e3fa3b81fe2e