[automerger skipped] Merge "Update path for BasicShellCommandHandler" am: 0a16497f0b am: 6b4c0707c6 am: 3c0bd167cb am: 10f3017cf7 -s ours

am skip reason: Change-Id I6866751292e2cb64df700a671ce6668a3431b8fc with SHA-1 691c29ccf3 is in history

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

Change-Id: I2795162fa5a0c3d4d1ce24a4930d514f15d1c83e