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

Change-Id: I78470f2d87e62154de46aa9ce12d6c4df3d31366