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

Change-Id: I618089b6e8d2cbfbf477b0fa79fd0ca9ce982ddb