Merge "Check the data directory before mount tmpfs" am: 767c2ba770

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1771085

Change-Id: I912c3a576a4e4e7d14307bae56b4452050786e5e