Merge "Donot disable Wi-Fi Calling when getting "registration error" intent."
am: 4ec0e8e865

Change-Id: I04c42bb5786b37f6d9aa124a663eef6d69b930a2