Merge changes from topic "revert-16320675-aosp_ims_config-DFMXSETNRH"

* changes:
  Revert "Add IMS configs to CarrierConfigManager"
  Revert "Add IMS Voice, Video, Supplementary services, emergency ..."