Merge "Fix invalid cast in DisplaManager.getDisplays" into udc-dev am: 168bddd4

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



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