Merge "Add config option to add extra cfg flags." into main am: 1358b287fe am: 8e278f7a69

Original change: https://android-review.googlesource.com/c/platform/development/+/2843096

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