Merge "Remove MultiDisplayTests#many_to_one_display_mapping" into udc-dev am: 5c795951

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



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