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

Change-Id: I83631d058eab50374e9f4a7a8d4fc9d1453f285d