[automerger skipped] Merge "Adapt to location changes in...

[automerger skipped] Merge "Adapt to location changes in NetworkScanRequestTracker" am: dbb07f6e am: 150942a1 am: c1d36f5a -s ours am: 9dd261eb -s ours

am skip reason: Merged-In Ic3860ae2ffdee31929082365c6de321c659aaeee with SHA-1 be6dbd50 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1695091

Change-Id: Id1761a5888062c6e327519b6f821829848758021