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

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

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



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