Resolve device and general sepolicy conflicts

Change-Id: I2db7f19be485d644398a0dd02d21a30cd4233935