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

Change-Id: Ib324844837c3de44c9fe35da656157a32938a8c3