Merge "service_manager.c: remove is_selinux_enabled calls" am: fce768d017 am: 4646e4c581
am: cf5361cf87

Change-Id: Ief023a3be6ad3b5e3e7bb3960e431470d6acb3f1