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: Ic46514287ad0d2aa9c802aa09e43c2d7636de6c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>