Merge "Fix display association for drawing tablets - part 2" into udc-dev am: 6a208de5

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



Change-Id: I9c1597166871663fc5054f7c54a4e86ac278e31a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>