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

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

Change-Id: Ib68f6c07e671ce732a4937d42d2afa0c5f81551c