Merge "Include subid in WiFi calling intent to settings"
am: d0c646e8b2

Change-Id: Iee04a9402089e56bd1209562e4942e1f913ca0b2