[automerger skipped] Merge "Include subid in WiFi calling intent to settings" am: d0c646e8b2 am: 5c572f7fb8 -s ours
am: 4d50b62da9 -s ours
am skip reason: change_id If0e7f6ac22b5255762e52eef4308a55a1077ae1a with SHA1 49a6697d3b is in history

Change-Id: Ibf77a839103afd0995739f4e0386e690c4f63304