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

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



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