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

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

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



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