Merge "Remove all multidisplay functionality in the Touch Latency sample app, for now. Also update to newer gradle versions, to allow editing in Studio." into udc-dev am: bd32923d am: 98aed7af

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



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