Merge "sepolicy: Update property_context for UICC"