Merge "AndroidDigestFactory: Simplify digest provider selection." am: 52b22f6074 am: 4dc0c31d01
am: 619fbcdbe3

Change-Id: I71f68588f818d967773ec6f9ab3e2a5ce15f1365