Merge "sepolicy: restore persist-time file"