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: 86ac1a3e" into rvc-d1-dev-plus-aosp am: ca8049f5

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

Change-Id: I64c187bd704008ddca98f36c41903fa5391be4bc