Merge "SEPolicy changes for BT SAP hal."