[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: aa96ad86 -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: I8d79c1670fd4d6cc12c42f582a5d51e4e969b3f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>