[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 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: I690e7fae49d421711fc46699519dc2211b375a99