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

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



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