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

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



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