[automerger skipped] Merge "Expose time / time zone system apis for telephony" am: e9dafe541e am: 76e21aa151 am: f2b5633071 -s ours
am skip reason: Change-Id I27e5aa4c594d5fbad0b6f043afb9e910dcba4349 with SHA-1 2be7ac4531 is in history

Change-Id: Ic4ae9beac124de716feb779d653ed86c67c39b2e