Merge "[SettingsLib] Remove access to isImsRegistered() and isActiveSubId()"