Merge "Fix bug that notifyDisplayInfoChanged is notified on wrong record" am: 5821bbc6e5

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

Change-Id: I27caffd81ca9c1a9579831e35d5bf971ee69e7e9