Merge "callForwarding: Add service class" am: bfb22afef2 am: 421d3248ec

Change-Id: I94b5432ba0f7d2419a3ef8bc7362e927c4c36996