Merge "permissions.cpp: remove is_selinux_enabled calls" am: ac28b58488
am: 2511c1ac20

Change-Id: I8cd793c540fcb92e869349133c7918a0e4f4c44f