Merge changes from topic "networkscoremanager-cachefilter"

* changes:
  SettingsLib: Rename CACHE_FILTER_* to SCORE_FILTER_*
  NetworkScoreManager: Expose SCORE_FILTER_* consts