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

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

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

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



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