Merge "move the triggering of injectFeatureConfig to GnssAdapter" into oc-dr1-dev am: de513b8d9c
am: 71b4c44ba0

Change-Id: I6ca345a3ad721068295912fb9335e0716df79fa3