[automerger skipped] Allow optional algorithms in StandardNames. am: 24dd556661 -s ours am: 13b87a9d1f -s ours am: 03d76d2aea -s ours

am skip reason: Merged-In Ic541380f2b0e6818769a5583a91e014963004447 with SHA-1 0621450f73 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/libcore/+/18672727

Change-Id: I0b3cd0355f5c823272a4f0b6ba9e65429ec61cba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>