[automerger skipped] Merge "Add FrequencyRange comparator to ServiceState" am: d0c404cb21 am: 5cb84d7f23
am: b527f8a44c  -s ours

Change-Id: I384994f412f4c6a79cac99387e42c3c2e113c3e2