Merge changes from topics "subscriptionInfo_builder",...

Merge changes from topics "subscriptionInfo_builder", "subscription_manager_service" am: 62447c97 am: 22fd5072

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



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