Fix -p option failing in set-values-from-xml command am: aafea2ef9f am: 3fadcc5a26

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

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