[automerger skipped] trusty:storageproxyd: Fix return paths on errors am: c66e99bf -s ours am: ad413137 -s ours

am skip reason: Merged-In I391ecff9ed3f892b7c3adae0ceeb18930791326f with SHA-1 09b493b1 is already in history

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

Change-Id: Ia76813815b69324336100aa499dce28b4d43869c