Merge "Update path for BasicShellCommandHandler" am: 0a16497f0b am: 6b4c0707c6

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

Change-Id: I7cdabc7ebeb4265ec9e69b306988c9ea22f51146