Merge "Fix bug that notifyDisplayInfoChanged is notified on wrong record" into rvc-dev am: ebb1992cd0

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

Change-Id: I4b776b23ce27ab7137e65c61f98ea3fc50cadc1e