Snap for 6145313 from b2a9b09ef9bcaf4d9f4eb004634908ed896e0478 to rvc-release am: 8af90f8384

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/keymaster/+/10123908

Change-Id: Ic236aff912a290886a361cdd0e2ca21e6f6b7d95