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

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

Change-Id: I1b65a8bddbb54bfb13946f72b06aa8d680ed4705