Merge "Use Activity label for setting the title for wifi-calling preference so that control resides within the Activity. Bug: 27707719" into nyc-dev am: a86b302
am: 4b84b61

* commit '4b84b61194d7bf38f70bba8e858c8977a09663ca':
  Use Activity label for setting the title for wifi-calling preference so that control resides within the Activity. Bug: 27707719

Change-Id: I155cb3ee94d626c2be1c2afc82608d582933219a