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

Change-Id: I7571ab56dd22a2bbca69a7f33ee7e008ee214170