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

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

Change-Id: Iccfe2e119a5788e89cb818bea899b39c4d210e8a