Merge "Fix location API usage for API_ADD_GNSS_MEASUREMENTS_LISTENER" into qt-dev
am: a1d0453641

Change-Id: I572fa4eebc9b4597e1c7af54030d999c41184c93