Merge CM-12.0 sepolicy again

Change-Id: Ie8ab94cd3772577f7ba0d7d7909077ff25edcb64