[automerger skipped] Merge "DO NOT MERGE Changed provisionData type from...

[automerger skipped] Merge "DO NOT MERGE Changed provisionData type from string to byte[]." into udc-dev am: 0334d1dc am: 4ed77eb3 -s ours

am skip reason: subject contains skip directive

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



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