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

Change-Id: I63a9f27535b2781de7d050071443d7fe73883de7