Merge "Check property for sdcardfs usage" am: 1a1b89524a am: 6e298f7213 am: 64c10a18c9

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1371505

Change-Id: I1b3bca625b4e3a0febc9e3e8ab5e0e185953d657