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

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



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