Dedupe sepolicy entry from merge

Change-Id: I5b0c0003f7a468b0ea1d394ba034ded679dd9a1d
Merge remote-tracking branch 'cm/cm-12.0' into cm-12.0