Merge "Add support for multiple displays" into udc-dev am: 2bc4fc7b am: 3e39e204

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



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