Merge "Revert "Cache satellite service states and restructure callback ...""...

Merge "Revert "Cache satellite service states and restructure callback ..."" into udc-dev am: 70f80c17 am: fc523899

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



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