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 am: 610b80e2

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

Change-Id: I7f9e7b7563493abfa37a6a0a29915eac27650768