Merge "Log the last error code of StatsLog failures"
am: 796e61c279

Change-Id: I2ba67db87d906bbea4d0e07b090058d319be1584