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

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

Change-Id: I75ec659199b4b892c60b44aa8ba36f68fc1b74e4