Merge "aconfig: consolidate how fully qualified flag name is calculated" into...

Merge "aconfig: consolidate how fully qualified flag name is calculated" into main am: 5f24a209 am: a57772e2

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



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