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

Merge "Merge "Default DisplayInfo crash in getRefreshRate fix" into udc-dev am: d86979d3 am: 7bdcaeef" into udc-d1-dev-plus-aosp am: cda87292

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



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