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

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

Change-Id: I481fc4c0410cc9ce1e1d5439fbe494a0dcf282a8