Merge "Add Vodafone Data Traffic Bundle shortcode to free list" into main am:...

Merge "Add Vodafone Data Traffic Bundle shortcode to free list" into main am: 15d7c7f3 am: 5dda0556

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



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