Merge "Revert "Add WFC Entitlement ID in RadioInfo to let tester update the entitlement id"" into tm-dev