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: Id00e096995721599e9c2d69d9fd9bf0118aa391e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>