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

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

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



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