Merge "Still use CAPABILITY_CALL_PROVIDER when getting E account"