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

Change-Id: I4d39bae1e0eddd524a4088ecb7e0a22aca5ecfba