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

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

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