Add CarrierMerged and SubscriptionId into WifiInfo#toString()

Bug: 180114077
Test: build
Change-Id: Ic2a1d527db3ea684715bbb2756a4838ab6391c80
2 files changed