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

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

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



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