[automerger skipped] Merge "Migrate android-opt-datetimepicker to aapt2." am: b82ce5be98
am: 45a539c2cb  -s ours

Change-Id: I0a2c0461546ae4f237011d93f79eaba6aebf9dc2