Merge "Launch WfcActivation with subscription ID" am: bd57f94a4c
am: 74fe4a9177

Change-Id: Ib61988a9f84ed10d4ac0d6b1a0d8b7d4f8897224