Merge "Merge "Fix bug that notifyDisplayInfoChanged is notified on wrong...

Merge "Merge "Fix bug that notifyDisplayInfoChanged is notified on wrong record" into rvc-dev am: ebb1992c am: 843a1f1a" into rvc-d1-dev-plus-aosp am: 86d7f74e

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

Change-Id: I1c082521a142a333d6916564c0cc18ff8316d588