Merge "Add all of the packages used to support older/upgrading devices" into...

Merge "Add all of the packages used to support older/upgrading devices" into main am: df791fda am: 834b0337

Original change: https://android-review.googlesource.com/c/platform/build/+/2820098



Change-Id: Ia17204cf5b774774b8bb70f1ba38bfb4d7d84cb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>