Merge "storageproxyd: Retry RPMB request on UNIT ATTENTION" am: a3359bb3c9 am: 49a4ab3f00

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

Change-Id: I43428c5abcff1aa457d05a7e2cb96954795a5f31