Merge "Add getSlotId API for ImsFeature and docs changes"
am: 375c74a865

Change-Id: I3c7e84575a552217637b611bff360b003ea43178