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