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

Change-Id: I891f11c6b2ddfe94bfd3bc9b0c44f8c9a6df5bf2