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

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



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