Charter amendment would clarify sheriff's disputed 287(g) authority