[automerger skipped] storageproxyd: Retry RPMB request on UNIT ATTENTION am: ab2257ee48 -s ours am: 857115b1ef -s ours

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

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

Change-Id: I9cad08a33895c097986a42b05a9acc6fe2b4ce22