[automerger skipped] Merge "trusty: storage: Allow starting without /data...

[automerger skipped] Merge "trusty: storage: Allow starting without /data mounted" into sc-dev am: c87ea84d -s ours am: 61ca2253 -s ours

am skip reason: Merged-In I3735e0752a6e502536000bd3102abda30cbd58fe with SHA-1 91e47506 is already in history

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

Change-Id: I4f811ac72ca5da12ad3f638cbdf075364af7c68e