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

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

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



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