Merge "Disable state save/restore for inflated date/time picker views" into oc-dev
am: 7f517b2fe6

Change-Id: Ifb028e4be2e1657a5a1e7e39b23a981bc21d26f5