Merge "Added flag and tests for SubscriptionPlan changes" into main am: e73da557d5

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

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