Merge "Further restrict SELinux API access" am: 076677330d
am: b49bc8212a

Change-Id: I4e13baad4cc463142b5899855e0613c5ea829c8d