Android n-iot-release-smart-display (NIT1.180611.004)
Merge "Migrate android-opt-datetimepicker to aapt2."