[automerger skipped] Merge "Set config_matchSecondaryInternalDisplay.. default...

[automerger skipped] Merge "Set config_matchSecondaryInternalDisplay.. default to false" into main am: 67b61593 am: 38759c3b am: d55919be am: 869c3a98 am: 77a947f0 -s ours

am skip reason: Merged-In I1f7b2cf45f6e1c865ea51a9947e68c9e1ffa8d13 with SHA-1 1e67584e is already in history

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



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