Merge "Expose ImsFeature#getFeatureState as @SystemApi" am: 40cae1c0c9 am: 9ffe0e8fd6

Change-Id: I599ae1de9e264bdbc099bd620f797dac1e48c55c