Merge "prebuilts: update shell to latest version" am: 86c27b3d18 am: bfc7efb772 am: 114518bb63

Original change: https://android-review.googlesource.com/c/platform/prebuilts/tools/+/1897759

Change-Id: Ia3fc5756fd31afed42b7f1c91c83c91c8b2cbbcb