[automerger skipped] [automerged blank] storageproxyd: Use alternate data path...

[automerger skipped] [automerged blank] storageproxyd: Use alternate data path if in DSU state 2p: 2727e165 am: 5fa893b4 -s ours

am skip reason: Merged-In I1d07e7c3d15dc1beba2d340181d1b11a7988f869 with SHA-1 6f890b47 is already in history

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

Change-Id: I7e9d09f0601fea1e03521299bd14eaafd3784f6c