Merge "Set config_matchSecondaryInternalDisplay.. default to false" into main am: 67b615937e am: 38759c3b14 am: d55919be34

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

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