Merge "Add SON Handler monitoring policy type"