Merge "Update SEPolicy for Thermal AIDL"