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

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

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