Merge changes from topic "networklocationFeatureId"

* changes:
  Pipe through featureId for network location checks
  Support feature context in TelephonyManager