Merge "Handle null intent in WifiCallingPreferenceController" into qt-dev
am: b4d94a8ccc

Change-Id: I025073624de894f70216eb46bb9cd48e8435f9dd