Merge "Don't test pw_shell for old vendor images" am: a96099e130 am: 77f309a26e

Original change: https://android-review.googlesource.com/c/platform/bionic/+/1360917

Change-Id: Ia32bd2f376944e296623deaa102fe060e850a7b8