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

Change-Id: I5f111f4e0b47dfc6a5da35cbbec2b842c6e72150