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

[automerger skipped] Merge "trusty: storage: Allow starting without /data mounted" into sc-dev am: c87ea84d am: aa51f69d -s ours am: c2232c15 -s ours am: 71120fbb -s ours

am skip reason: Merged-In I3735e0752a6e502536000bd3102abda30cbd58fe with SHA-1 84b43537 is already in history

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

Change-Id: I972e451fe2b97577f04bc2c4722a6ab79c4a512e