Merge changes from topic "Cache satellite states 2" into udc-dev am: dab3190c

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



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