Merge "Change getCallForwardingOption to specify voice service class." am: 0f34557b am: d868b495 am: da462bc9 Change-Id: I4ec38581882e24863f955b5a08118a2c4ed8dcf7