Merge "Change target package for com.android.car.shell" into rvc-qpr-dev