Merge "Remove redundent logic in isWfcProvisioned" am: 548633b97c am: 0a32f1aba8 am: 40a9d0b106
am: 9415e66b9c

Change-Id: Ic88bf44ab5a09bfc917317c98aad3053832fe66a