Merge "Allow cellular modem scanning while satellite mode is on." into udc-dev...

Merge "Allow cellular modem scanning while satellite mode is on." into udc-dev am: 236ece6f am: b0171aa5

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



Change-Id: I298e7494437db259b5ec58a81ee7e09006653304
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>