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

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

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



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