Merge "Use testable components to cleanup display tests a bit." into udc-dev am: db0af129

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



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