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

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

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



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