Merge "Remove viewport display ID assignment in pointer mode" am: b62f9e452e

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

Change-Id: I85a16b1aa60ab39e8ec9b32aff9b65ebea1aec21