Merge changes from topic "aconfig-package-ident-fixes" am: 9c3da21b

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



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