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

Merge "[automerger skipped] Merge "trusty: storage: Allow starting without /data mounted" into sc-dev am: c87ea84d am: aa51f69d am: 2f153a4a -s ours" into sc-v2-dev-plus-aosp am: 344e8dc5 -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: Iaea18ddbacc19802f21518cd992e5f6fbc814f40