Merge "Wait for location settings change in test" into stage-aosp-rvc-ts-dev