Merge "sepolicy: Update secure policies for hbtp"