Fix DateTimePicker for Lollipop

Lollipop finally fixes
https://code.google.com/p/android/issues/detail?id=34833, but in so
doing, it rebreaks the partial fix I'd already added. So now I've made
my own new fix to fix the fix.