[automerger skipped] Merge "Revert "[Telephony mainline] Move the functionality into the cal..."" am: 49ced0c1 am: a9e5e5c0 -s ours
am skip reason: Change-Id Ieee6527c9a74aca9cc4797f2b3c09788e517bf37 with SHA-1 ae0c8cd0 is in history
Change-Id: I06bf64e7136fd81a75fe6f4d0b1ce64fcb11d8da