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

Change-Id: Id7db26226955d9ce15481db62988d872d8114299