Merge "Revert [Telephony mainline] Move the functionality into the calling...
Merge "Revert [Telephony mainline] Move the functionality into the calling locations." into rvc-dev am: f4f6c31f am: 1547da58
Change-Id: I2fb68939a1758316932af7f15871e8870694d8fc