Merge "Close Wi-Fi Calling screen if provisioning status changes to disallow" am: db7da4cba8
am: ee4a5291a1

Change-Id: I2a4d3f97899cbcfb96904386bfe7c28eacdbce33