Merge "fixing the location api level race condition on callbacks am: 2569796dab am: 01f30e42a9 am: f53da2cc3b" into rvc-qpr-dev-plus-aosp