Merge "Support updating satellite listening timeout duration from CTS" into...

Merge "Support updating satellite listening timeout duration from CTS" into udc-dev am: d93b105a am: daf07d63

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



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