Resolve sepolicy conflicts

Change-Id: I8aab4d823ab33f22840e9db153ed7606ead22a54