Merge "fix: show overrides in device_config list" into main am: c189e16141

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3288075

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