Merge "add Shell-package-library to allow product type level update" into rvc-qpr-dev am: 0ade1ea0eb

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I42995f9c504fb34480fc3ba199ca431ee76a486a