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

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

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