Merge changes from topics "subscriptionInfo_builder",...

Merge changes from topics "subscriptionInfo_builder", "subscription_manager_service" am: 20f007c3 am: f3db9c87

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2457667



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