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

Change-Id: I853e8b3c22f51a5f84ada0df9621a6c469e08124