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

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

Change-Id: Id84757f780fcb71934ed3f6915bc2a116a13831c