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

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

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