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

Change-Id: Iec1ea80a9a3b41c9cbe7fabb861a79aa2d094548