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

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



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