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

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



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