[automerger skipped] Merge "add Shell-package-library to allow product type...

[automerger skipped] Merge "add Shell-package-library to allow product type level update" into rvc-qpr-dev am: 0ade1ea0 am: 8bc0064d -s ours

am skip reason: Change-Id I6e9103c3275cb2e6df5dc586588eccd7d2ab6b06 with SHA-1 bd16eb52 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I736889564fc1f33de9322f043f6ffc79a3758a69