Merge "Add getSlotId API for ImsFeature and docs changes" am: 375c74a8 am: 7c50667b am: 6dd4f55e am: f3e49bbf Change-Id: Ie2e2296acae1211009e8d1aa06b111cfdda52b57