[automerger skipped] Merge "Test display associations in TouchIntegrationTest"...

[automerger skipped] Merge "Test display associations in TouchIntegrationTest" into udc-qpr-dev am: 639f5cb5 am: a6897a04 -s ours

am skip reason: Merged-In I12fb815eec20b345545899a20dc28110bfd321f0 with SHA-1 440bf65f is already in history

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



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