Merge "Cleanup sepolicy related to APEX pre/post-install hooks"