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

Change-Id: Iaf9670b98ef838967ceed1dc9f8cf950532fc48b