Snap for 7149879 from c69e5f8f89794d59ca14fc3ea646903c46ddd381 to sc-release am: 54daf42da4

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nist-pkits/+/13593816

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I452cf6f9c50f0f6954787fedccd127cdc084611a