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

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

Change-Id: I3a2788e11492fff7f8303725762b0cd84bff39ed