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

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

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