Merge "Remove viewport display ID assignment in pointer mode" am: b62f9e452e am: ccbd11bb1f am: 3525bf8713 am: 581523889c

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

Change-Id: Ib22b06b90a00ea866c5d3839378b5bb335fbf9b9