Merge "To enable scroll function at DatePickerDialog" into nyc-mr2-dev
am: 8c917322a7

Change-Id: I4d5a3afeb1b04f3ea955ed92bad3430d117d27ac