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

Change-Id: I1468bbc39f3df30ade5728ae78100f7ad4346dc3