Merge "Fix the Wifi Calling back button goes to wrong screen" am: 903d2610dd am: 7c4b70c6e5
am: 05281b8d4b

Change-Id: If7b7e7fab2aa0e8d81d185363685b419d5630cb1