Merge "Migrate telephony code away from Time"
am: b8bdc72174

Change-Id: Ic597ff0fa3317166b94b42c35e17e609c5f9bfe0