Merge "fs_mgr: removing is_device_secure()" am: af54c27e1b
am: 6353d514e8

Change-Id: Ia0138aba2d0eed16d5b61abfbfab9246d9423d62