[automerger skipped] Merge "storageproxyd: Use alternate data path if in DSU...

[automerger skipped] Merge "storageproxyd: Use alternate data path if in DSU state" into sc-v2-dev am: 9172a458 -s ours am: a1dc7c8a -s ours

am skip reason: Merged-In I1d07e7c3d15dc1beba2d340181d1b11a7988f869 with SHA-1 2727e165 is already in history

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

Change-Id: Icd644356c7f7fc5ca730feeaf8c7e34c11f476b4