[automerger skipped] Merge "add PlatformAconfigPackageInternal" into main am:...

[automerger skipped] Merge "add PlatformAconfigPackageInternal" into main am: 7b4c46e4 am: e9897e66 -s ours

am skip reason: Merged-In Ie24e5d5585ff8a7d287ef62a4a58b58b697f81d6 with SHA-1 25cbc385 is already in history

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



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