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

Change-Id: Id100676b439dc4e15063adc9d7822d89f352c86f