Merge "callForwarding: Add service class" am: bfb22afef2

Change-Id: I06f74a156ab7deb433a3eb84d1c0121b8d6741b0