[automerger skipped] storageproxyd: Retry RPMB request on UNIT ATTENTION am: ab2257ee -s ours am: 8d2f577b -s ours am: 358945fe -s ours

am skip reason: Merged-In Ib970e779365bb396756c114684c7f6e56a737ab1 with SHA-1 a9085181 is already in history

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

Change-Id: Ic65ade962617f852d11e453180984499c81097bf