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

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

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