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

Change-Id: I1ae1f1c463e21ab56106390e72030fd637bf45fc