Merge changes from topics "bug118835133_2", "bug118835133_1"

* changes:
  Fix android.text.format.Time behavior
  Add a test for behavior around Integer.MAX_VALUE
  Change behavior for times < first transition