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: 3207002e

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



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