[automerger skipped] Merge "SF: Temporarily expose primary display id" into...

[automerger skipped] Merge "SF: Temporarily expose primary display id" into sc-v2-dev am: f7f7af94 am: 04ab8537 -s ours

am skip reason: Merged-In I2b0a92196a8a1f05f7d99b531775b9979f07af98 with SHA-1 8c8db54b is already in history

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

Change-Id: I3122ae97e0e9165bf3d164fcd4f86a36ad072614