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

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

Change-Id: I7f016f921c345aeef2bb8c15def879c8fb221a0e