Merge "Add FrequencyRange comparator to ServiceState" am: d0c404cb21
am: 5cb84d7f23

Change-Id: I5550790e9db3604bf35d4f01b6e7fef316e3809e