Fix some nits in android metrics reporter am: 8cbf696f9f am: 09aef9ff41
am: db68add202

Change-Id: I5a332476f953fd5c625d4a9294e5d847ed259d1f