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

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

Change-Id: I952a9842c064bc7faf2245ba5fa95bfce8881e3b