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

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



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