am ab9cbf1c: am 7194361c: Merge "Properly handle dispatchRestoreInstanceState for new-style DatePicker" into lmp-dev

* commit 'ab9cbf1ca187453910ceca717e54843c7494cb98':
  Properly handle dispatchRestoreInstanceState for new-style DatePicker