Merge "SF: Temporarily expose primary display id" am: c477cea476

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

Change-Id: I718402a7fe4830f9c543c0ab59ab66f5f8a69f66