Merge "Migrate android-opt-datetimepicker to aapt2."
am: b82ce5be98

Change-Id: I70fe1b32d321e466d3657c8c42e33fc8c1deb5ce