Merge "fs_mgr: make is_device_secure() work even in the absence of properties." am: 0026f1e693
am: 5cdbcbbcbf

Change-Id: Ifa3a00067902ab542817cf6b0008a07a28899210