Merge "Handle null intent in WifiCallingPreferenceController" into qt-dev am: b4d94a8ccc
am: 192367bef2
am: feee521179
Change-Id: I644f6393a1ab930aa22f2761350e22956e7bce1e
This commit is contained in: