[automerger skipped] Merge "Add TEST_MAPPING for displayservicetests" into...

[automerger skipped] Merge "Add TEST_MAPPING for displayservicetests" into udc-qpr-dev am: c5c66d40 am: 6f71f8a6 -s ours

am skip reason: Merged-In I55bb88ea2ab656d5fbdd3a23fdc2a6371384aec9 with SHA-1 3e8dd0e6 is already in history

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



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