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: 3e808826
Change-Id: Ib308929ad0745f178f4aeb287af5ab157cb557f0