Merge "Telephony: Introduce a base class for ISMS.aidl." am: f03b8e2471 am: 0397b9b65d
am: 42bf3bef2b

Change-Id: I0de662b8429769129017ea5549d590a335842540