Merge "Fix invalid cast in DisplaManager.getDisplays" into udc-dev am: 168bddd4 am: 719c89e0 am: 3a339962 am: 5ea715b5

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



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