Merge changes from topic "carshell"

* changes:
  add Shell-package-library to allow product type level update
  Change target package for com.android.car.shell