Merge "Cache Display.Mode so we can ignore refresh rate changes" into rvc-d1-dev am: b2641d1d13

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

Change-Id: I271c16c0d9c8d92a90730c72768bc902dd82f970