[automerger skipped] Merge "Added flag and tests for SubscriptionPlan changes"...

[automerger skipped] Merge "Added flag and tests for SubscriptionPlan changes" into main am: e73da557 am: fb84ddc2 -s ours

am skip reason: Merged-In I25b70907eda6b3bcbf34f786ed86d64432c7331f with SHA-1 52a56a8a is already in history

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



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