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: 804ba1d4 am: bc41ab37

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



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