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: c9464990

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



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