[automerger skipped] Merge "SF: return the active display from...

[automerger skipped] Merge "SF: return the active display from getInternalDisplayId" into sc-v2-dev am: 403a0be8 am: 5d8dc5cc -s ours

am skip reason: Merged-In Ief856c736c78ab9ddca3c4ffccd8e374c050b0bd with SHA-1 2a0066da is already in history

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

Change-Id: I3870cf5d52202802079eee55287ec8a8c4e280dc