Merge "Default DisplayInfo crash in getRefreshRate fix" into udc-dev am:...

Merge "Default DisplayInfo crash in getRefreshRate fix" into udc-dev am: d86979d3 am: a3c12cad am: d0e5089a

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



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