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

Change-Id: Idb8fb584b38914d1c510737716e1eff6e70b0f65