[automerger skipped] Merge "Change target package for com.android.car.shell"...

[automerger skipped] Merge "Change target package for com.android.car.shell" into rvc-qpr-dev am: 24a54292 am: 81eee38e -s ours

am skip reason: Change-Id I139b47fcb2992e42da020aaac8680ae8dd2efac0 with SHA-1 2bd010b7 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13383398

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If5077bd6d181c9ae7e1536e31fe089038a0c2aad