Merge "Update path for BasicShellCommandHandler" am: 0a16497f0b

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

Change-Id: I04802358443d63c33540154073a34109bfe79ce8