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

Change-Id: I499c443b15b38885970dca6deed520d0fc567892