Merge "Fix -p option failing in set-values-from-xml command" am: 3220e504c7

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/2112504

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