[automerger skipped] Merge "Public StatsLog API for generic mainline logging." am: e1556e9096 am: c9dfc05321 -s ours
am: 0e1528d7f2 -s ours
am skip reason: change_id I8a9a91e638d730e3ff69cb9345692e49e0db3c96 with SHA1 be0482b421 is in history

Change-Id: I0a872fc6de23758bff9a2fd54588f235577d5340