Merge "Added DefaultAccountAndState#DEFAULT_ACCOUNT_STATE_SIM to support SIM account being set as default account." into main