Merge "Add TEST_MAPPING for com.android.server.display" into tm-dev am: 3ce32193 am: d4e46be1 am: b11a8a1e

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



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