Merge "aconfig: return stored flag type enum as a part of flag offset info"...

Merge "aconfig: return stored flag type enum as a part of flag offset info" into main am: ba670284 am: 2aec759e

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



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