Merge "service_manager.c: remove is_selinux_enabled calls"
am: fce768d017

Change-Id: I1c53b32979e0d9d9706b52258acfd31341b9c4d1