Snap for 6348860 from 27fa91879c95e9ce0519dfb35720f892071c8b2a to rvc-release am: 982c6c1c88

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

Change-Id: Ib11d1f024b622a4f7cbbc776be77cb93bfc6c9c2