Merge "Add a basic benchmark for android.text.format.Time" am: 9038c7231d
am: e25cc6b0e7

Change-Id: I26854156a2f0451622bd70d9dba93b9bee669298