Merge "Move display tests to DisplayServiceTests module" into udc-qpr-dev am: ffa5a8496a am: d5009cd78f

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

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