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

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



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