Merge "Don't add extra_cfg twice." into main am: 28a3499487

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

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