[automerger skipped] Merge "fix: show overrides in device_config list" into main am: c189e161 am: 4062d9cb -s ours

am skip reason: Merged-In Ifd6040561aaeadc143384cba3a749c4a85fb2f15 with SHA-1 985053d4 is already in history

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



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