Merge "ColorDisplayServiceTest fix: adding missing DisplayManagerInternal...

Merge "ColorDisplayServiceTest fix: adding missing DisplayManagerInternal service" into udc-dev am: d600e251 am: 56dd059f

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



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