Merge "AndroidDigestFactory: Simplify digest provider selection."