[automerger skipped] Merge "SF: default display is active display" into...

[automerger skipped] Merge "SF: default display is active display" into sc-v2-dev am: 2168bd7d am: c7d7c4f3 -s ours

am skip reason: Merged-In Icc305cdeec1c8a04729f00ff795dfbb806d8f72c with SHA-1 ed3290f8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15098844

Change-Id: Ic86403a9f424a419739e522838d0ccec98a78602