* commit '9961a6d8e1a7738e68d64e77871210bfd832c780': Fix incomplete move of flags from PhoneAccount to PhoneAccountMetadata