[automerger skipped]Merge "Dummy StatsLog class" into stage-aosp-master
am: fe5fdb1213  -s ours

Change-Id: I6b5a02d285536a5a4433aa4060e72cb7acd16e35