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

Change-Id: If79fef90e6b7b6a9633d922fa79b220c0328bb41