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

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



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