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

Change-Id: Ib946404b724ddfaceae06eb5d6026137052dcb7b