Merge "Merge "Expose ImsFeature#getFeatureState as @SystemApi" am: 40cae1c0c9" into stage-aosp-master am: 85bf0f73d0

Change-Id: I7dec0f34c1a2f17fd2abd1f79908c8d8eb07e1be