Merge "reduce number of location query" into 24D1-dev am: b6f8618819

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/27552336

Change-Id: I75f1168b1968bc21865ee49ba835156dbcbf5cbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>