[automerger skipped] Merge "Move display mocking tests to DisplayServiceTests"...

[automerger skipped] Merge "Move display mocking tests to DisplayServiceTests" into udc-qpr-dev am: 45300425 -s ours

am skip reason: Merged-In I242371f84185b1f770554a5ae0fbab6ed287a86f with SHA-1 d790d2db is already in history

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



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