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

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

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