Merge "Use platform-compat-fw to separate enforce location change" am: b8f1dffd74 am: 05d860a4cb am: 6548c8925c am: 8342e21598

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

Change-Id: I09502c3c04e5dd515b5e14142d2a1d856edfc9de