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

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

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