Fix -p option failing in set-values-from-xml command am: aafea2ef9f am: 8264e7d274 am: e4300c4349

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

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