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

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

Change-Id: I519d83c49bf5bb4ef5ca3b2928265e188e1160a4