Merge "Use android.hardware.gnss@2.0-service.ranchu in device/generic/goldfish/vendor.mk" into sc-v2-dev