Merge "Add FrequencyRange comparator to ServiceState"
am: d0c404cb21

Change-Id: I4b20c8a2d38a6f64530a281a3db9df18a593e845