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: fc451f13 am: ec6beb5f

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



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