[automerger skipped] Merge changes from topics "subscriptionInfo_builder",...

[automerger skipped] Merge changes from topics "subscriptionInfo_builder", "subscription_manager_service" am: 20f007c3 am: f3db9c87 am: ebc95977 -s ours

am skip reason: Merged-In If2973d78579cc0d0d3c6720d22a4b49a04a2b813 with SHA-1 27209094 is already in history

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



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