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

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

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