Merge "trusty:storageproxyd: Fix in_cdb.length setting on send_ufs_rpmb_req" am: 55e8954950 am: f20e589c00

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

Change-Id: I1e3b4fe083d2670b1f31f331e540ee61cd64f2a1