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

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



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